widget: Remove _gtk_widget_override_size_request()
authorBenjamin Otte <otte@redhat.com>
Tue, 24 Mar 2015 03:37:26 +0000 (04:37 +0100)
committerBenjamin Otte <otte@redhat.com>
Wed, 28 Oct 2015 18:44:27 +0000 (19:44 +0100)
The function was only used by the geometry widget.

gtk/gtkwidget.c
gtk/gtkwidgetprivate.h

index 813b0fe6a77d061fca88e58bbc89163b0c622e14..348e8740210ee55743c90565186b67e174dcf7c9 100644 (file)
@@ -11118,52 +11118,6 @@ gtk_widget_has_size_request (GtkWidget *widget)
   return !(widget->priv->width == -1 && widget->priv->height == -1);
 }
 
-/**
- * _gtk_widget_override_size_request:
- * @widget: a #GtkWidget
- * @width: new forced minimum width
- * @height: new forced minimum height
- * @old_width: location to store previous forced minimum width
- * @old_height: location to store previous forced minimum height
- *
- * Temporarily establishes a forced minimum size for a widget; this
- * is used by GtkWindow when calculating the size to add to the
- * window’s geometry widget. Cached sizes for the widget and its
- * parents are invalidated, so that subsequent calls to the size
- * negotiation machinery produce the overridden result, but the
- * widget is not queued for relayout or redraw. The old size must
- * be restored with _gtk_widget_restore_size_request() or things
- * will go screwy.
- */
-void
-_gtk_widget_override_size_request (GtkWidget *widget,
-                                  int        width,
-                                  int        height,
-                                  int       *old_width,
-                                  int       *old_height)
-{
-  gtk_widget_get_size_request (widget, old_width, old_height);
-  gtk_widget_set_usize_internal (widget, width, height,
-                                GTK_QUEUE_RESIZE_INVALIDATE_ONLY);
-}
-
-/**
- * _gtk_widget_restore_size_request:
- * @widget: a #GtkWidget
- * @old_width: saved forced minimum size
- * @old_height: saved forced minimum size
- *
- * Undoes the operation of_gtk_widget_override_size_request().
- */
-void
-_gtk_widget_restore_size_request (GtkWidget *widget,
-                                 int        old_width,
-                                 int        old_height)
-{
-  gtk_widget_set_usize_internal (widget, old_width, old_height,
-                                GTK_QUEUE_RESIZE_INVALIDATE_ONLY);
-}
-
 /**
  * gtk_widget_set_events:
  * @widget: a #GtkWidget
index 96558f985eee640a3b6e7f17f6a0cbcab60e8a54..6f49d245d7a33d382dc6e7f921e349de160f69a3 100644 (file)
@@ -181,14 +181,6 @@ void         _gtk_widget_add_attached_window    (GtkWidget    *widget,
 void         _gtk_widget_remove_attached_window (GtkWidget    *widget,
                                                  GtkWindow    *window);
 
-void _gtk_widget_override_size_request (GtkWidget *widget,
-                                        int        width,
-                                        int        height,
-                                        int       *old_width,
-                                        int       *old_height);
-void _gtk_widget_restore_size_request  (GtkWidget *widget,
-                                        int        old_width,
-                                        int        old_height);
 void _gtk_widget_get_preferred_size_for_size   (GtkWidget         *widget,
                                                 GtkOrientation     orientation,
                                                 gint               size,